Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Fri, 26 Aug 2005 20:47:16 +0000 (13:47 -0700)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Fri, 26 Aug 2005 20:47:16 +0000 (13:47 -0700)
1  2 
xen/arch/x86/x86_32/entry.S

Simple merge